build: Don't use Wayland GtkClipboard implementation if also building for X
authorRob Bradford <rob@linux.intel.com>
Thu, 22 Mar 2012 12:11:57 +0000 (12:11 +0000)
committerRob Bradford <rob@linux.intel.com>
Thu, 29 Mar 2012 09:50:07 +0000 (10:50 +0100)
Workaround for: https://bugzilla.gnome.org/show_bug.cgi?id=672358

gtk/Makefile.am

index e40232edb961b0ec9e31237764f0527062fc0722..e939a77d6afcfb40180f270d84344469959debba 100644 (file)
@@ -904,6 +904,7 @@ gtk_clipboard_dnd_c_sources =       \
        gtkdnd-quartz.c
 else
 if USE_WAYLAND
+if !USE_X11
 # No wayland gtkdnd-wayland.c yet
 gtk_clipboard_dnd_c_sources =  \
        gtkclipboard-wayland.c \
@@ -911,6 +912,9 @@ gtk_clipboard_dnd_c_sources =       \
 else
 gtk_clipboard_dnd_c_sources = gtkclipboard.c gtkdnd.c
 endif
+else
+gtk_clipboard_dnd_c_sources = gtkclipboard.c gtkdnd.c
+endif
 endif
 
 # we use our own built_sources variable rules to avoid automake's